bitkeeper revision 1.1159.258.42 (4230e421NhFkCppVay5rDH0tzHn2bQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 11 Mar 2005 00:19:45 +0000 (00:19 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 11 Mar 2005 00:19:45 +0000 (00:19 +0000)
commitba3ece2d2e1312b9062b32ae249e662795a91f76
treef738afce391ceb3939d2bfc016f6cbb9993abb4b
parentccb808be8ea97f9d25370c9f1bd11aba2076fae2
parentca7784e7731eb9e9827df986ce4a71afc25eca4b
bitkeeper revision 1.1159.258.42 (4230e421NhFkCppVay5rDH0tzHn2bQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk-2.6.11
.rootkeys
linux-2.6.11-xen-sparse/drivers/xen/balloon/balloon.c
linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c
linux-2.6.11-xen-sparse/drivers/xen/console/console.c